bitkeeper revision 1.1001 (40d86329XrlwzEAYUmH3dmwwNM7-OA)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno

diff --cc tools/xenmgr/lib/XendDomainInfo.py
index 88598cd9c62299e3337a8e599441ccd584e582c1,c4c93c8d578599e70e0822d9dc6481e20ac109a3..067f2f5d31c9e52db916a3c3a79653d003e02469
--- 1/tools/xenmgr/lib/XendDomainInfo.py
--- 2/tools/xenmgr/lib/XendDomainInfo.py
+++ b/tools/xenmgr/lib/XendDomainInfo.py
@@@ -116,18 -111,14 +116,18 @@@ class XendDomainInfo
                  ['name', self.name],
                  ['memory', self.memory] ]
          if self.info:
-             run   = (self.info['running'] and 'r') or '-'
-             block = (self.info['blocked'] and 'b') or '-'
-             stop  = (self.info['paused']  and 'p') or '-'
-             susp  = (self.info['shutdown'] and 's') or '-'
-             crash = (self.info['crashed'] and 'c') or '-'
+             run   = (self.info['running'] and 'R') or 'r'
+             block = (self.info['blocked'] and 'B') or 'b'
+             stop  = (self.info['paused']  and 'P') or 'p'
+             susp  = (self.info['shutdown'] and 'S') or 's'
+             crash = (self.info['crashed'] and 'C') or 'c'
              state = run + block + stop + susp + crash
 -            sxpr.append(['cpu', self.info['cpu']])
              sxpr.append(['state', state])
 +            if self.info['shutdown']:
 +                reasons = ["poweroff", "reboot", "suspend"]
 +                reason = reasons[info['shutdown_reason']]
 +                sxpr.append(['shutdown_reason', reason])
 +            sxpr.append(['cpu', self.info['cpu']])
              sxpr.append(['cpu_time', self.info['cpu_time']/1e9])
          if self.console:
              sxpr.append(self.console.sxpr())